From f7724341b89e7ab54f87f7765e824e97491a9f96 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 2 Jul 2014 19:33:09 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (85cfc2e735) New changes: e450f32 Don't transplant disabled stylesheets 85cfc2e Localisation updates from https://translatewiki.net. Change-Id: I6fe171cf8cd8e066779f6cf43918569906a9efa1 --- resources/lib/oojs-ui/i18n/lv.json | 6 +++++- resources/lib/oojs-ui/oojs-ui-agora.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-apex.css | 4 ++-- resources/lib/oojs-ui/oojs-ui.js | 7 +++++-- resources/lib/oojs-ui/oojs-ui.svg.css | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/resources/lib/oojs-ui/i18n/lv.json b/resources/lib/oojs-ui/i18n/lv.json index 8b0bee46c2..7ad74dccd6 100644 --- a/resources/lib/oojs-ui/i18n/lv.json +++ b/resources/lib/oojs-ui/i18n/lv.json @@ -11,5 +11,9 @@ "ooui-dialog-action-close": "Aizvērt", "ooui-outline-control-move-down": "Pārvietot vienumu uz leju", "ooui-outline-control-move-up": "Pārvietot vienumu uz augšu", - "ooui-toolbar-more": "Vairāk" + "ooui-toolbar-more": "Vairāk", + "ooui-dialog-confirm-title": "Apstiprināt", + "ooui-dialog-confirm-default-prompt": "Vai esat pārliecināts?", + "ooui-dialog-confirm-default-ok": "Labi", + "ooui-dialog-confirm-default-cancel": "Atcelt" } diff --git a/resources/lib/oojs-ui/oojs-ui-agora.css b/resources/lib/oojs-ui/oojs-ui-agora.css index dce8c5e6a3..dc999cd549 100644 --- a/resources/lib/oojs-ui/oojs-ui-agora.css +++ b/resources/lib/oojs-ui/oojs-ui-agora.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (432a76f7d4) + * OOjs UI v0.1.0-pre (85cfc2e735) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-07-02T16:19:00Z + * Date: 2014-07-03T02:33:09Z */ .oo-ui-dialog-content .oo-ui-window-closeButton { position: absolute; diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 47231850f5..7018b52067 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (432a76f7d4) + * OOjs UI v0.1.0-pre (85cfc2e735) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-07-02T16:19:00Z + * Date: 2014-07-03T02:33:09Z */ .oo-ui-dialog { background-color: #fff; diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index dd1335028c..f2e3202bcc 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (432a76f7d4) + * OOjs UI v0.1.0-pre (85cfc2e735) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-07-02T16:19:00Z + * Date: 2014-07-03T02:33:09Z */ ( function ( OO ) { @@ -750,6 +750,9 @@ OO.ui.Frame.static.transplantStyles = function ( parentDoc, frameDoc, timeout ) for ( i = 0, numSheets = parentDoc.styleSheets.length; i < numSheets; i++ ) { styleNode = parentDoc.styleSheets[i].ownerNode; + if ( styleNode.disabled ) { + continue; + } if ( styleNode.nodeName.toLowerCase() === 'link' ) { // External stylesheet // Create a node with a unique ID that we're going to monitor to see when the CSS diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 5cab69712d..a249314ee1 100644 --- a/resources/lib/oojs-ui/oojs-ui.svg.css +++ b/resources/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (432a76f7d4) + * OOjs UI v0.1.0-pre (85cfc2e735) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-07-02T16:19:00Z + * Date: 2014-07-03T02:33:09Z */ /* Textures */ -- 2.20.1